From 4869013a8dd5796ad2bfe009aeeafdac6e53b223 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timm=20B=C3=A4der?= Date: Mon, 6 May 2019 17:58:55 +0200 Subject: [PATCH] gl renderer: Fix coloring shader We *just* pre-multiplied u_color but then didn't use its rgb values. This fixes backdrop scale marks in Adwaita to not be white. --- gsk/resources/glsl/coloring.fs.glsl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gsk/resources/glsl/coloring.fs.glsl b/gsk/resources/glsl/coloring.fs.glsl index b8aa382eab..9de8a13ba7 100644 --- a/gsk/resources/glsl/coloring.fs.glsl +++ b/gsk/resources/glsl/coloring.fs.glsl @@ -8,7 +8,8 @@ void main() { color.rgb *= color.a; // u_source is drawn using cairo, so already pre-multiplied. - color = vec4(u_color.rgb * diffuse.a * u_alpha, diffuse.a * color.a * u_alpha); + color = vec4(color.rgb * diffuse.a * u_alpha, + color.a * diffuse.a * u_alpha); setOutputColor(color); } -- 2.30.2